Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:01:00 +0000 (09:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:01:00 +0000 (09:01 -0700)
commit607dfdeba52a4932303e981cba98628dd1677ad3
treeb902b9b76dbf6bd8f3efe063d5e4eda9d3317134
parent1d340d57e1eb0bde816c925222d5aa711a54a750
parent631c06db134089a5aaa1e8dd997250ee5c7f0fc4
Merge from trunk.
src/ChangeLog
src/composite.c
src/fns.c
src/image.c